Specify the C include for Unix printing API

Instead of using the INCLUDE directive inside the sections file, we can
specify the default C include in the gtkdoc-mkdb arguments, and override
it inside the C sources that need it.

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index ae7361936a6ae9d5efd64d38869117daf9bf4ab5..a7db2717a5e3af40bee2b70ac1c5c16350a05d2a 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -1,6 +1,3 @@
-
-<INCLUDE>gtk/gtk.h</INCLUDE>
-
 <SECTION>
 <FILE>gtkaboutdialog</FILE>
 <TITLE>GtkAboutDialog</TITLE>
@@ -5375,7 +5372,6 @@ GtkPrintOperationPrivate
 
 
 <SECTION>
-<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintunixdialog</FILE>
 <TITLE>GtkPrintUnixDialog</TITLE>
 GtkPrintUnixDialog
@@ -5723,7 +5719,6 @@ gtk_print_context_get_type
 
 
 <SECTION>
-<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintjob</FILE>
 <TITLE>GtkPrintJob</TITLE>
 GtkPrintJob
@@ -5775,7 +5770,6 @@ gtk_print_job_get_type
 
 
 <SECTION>
-<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkpagesetupunixdialog</FILE>
 <TITLE>GtkPageSetupUnixDialog</TITLE>
 GtkPageSetupUnixDialog

diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 66dfc0291f26c6b8a375c0c1afbcedbec89b27a6..12147fa674ec0d11d528d5ea4302b52caf15bb15 100644 (file)
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -412,6 +412,9 @@ gnome.gtkdoc('gtk4',
                '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
                '--ignore-headers=' + ' '.join(private_headers),
              ],
+             mkdb_args: [
+               '--default-includes=gtk/gtk.h',
+             ],
              fixxref_args: [
                '--html-dir=@0@'.format(docpath),
                '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),

diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index b836a435eda77e6a1dd2d23d105e5b42a7ebf216..5bcd37a6bbf0607dca9d6cd73903c93a46e346c1 100644 (file)
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -49,6 +49,7 @@
  * SECTION:gtkpagesetupunixdialog
  * @Short_description: A page setup dialog
  * @Title: GtkPageSetupUnixDialog
+ * @Include: gtk/gtkunixprint.h
  *
  * #GtkPageSetupUnixDialog implements a page setup dialog for platforms
  * which don’t provide a native page setup dialog, like Unix. It can

diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index c3d1ce70bb4a2acec91808e507bc16735aca9d3e..e8e1c7c3b50b23d109ac93fb7ace5949db36f84d 100644 (file)
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -19,6 +19,7 @@
  * SECTION:gtkprintjob
  * @Title: GtkPrintJob
  * @Short_description: Represents a print job
+ * @Include: gtk/gtkunixprint.h
  *
  * A #GtkPrintJob object represents a job that is sent to a
  * printer. You only need to deal directly with print jobs if

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 2a9a877f9c32d9ed0a29dc0fbf6c408346af06df..6fcd20858828ab0412b2508389e960aa852981f6 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -62,6 +62,7 @@
  * @Short_description: A print dialog
  * @Title: GtkPrintUnixDialog
  * @See_also: #GtkPageSetupUnixDialog, #GtkPrinter, #GtkPrintJob
+ * @Include: gtk/gtkunixprint.h
  *
  * GtkPrintUnixDialog implements a print dialog for platforms
  * which don’t provide a native print dialog, like Unix. It can